From 953ed6cf335774b42d88f95106280fa9fe4976a8 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 2 May 2017 13:12:13 +0200 Subject: [PATCH] Update d/changelog, fix FTBFS, add a target for cross-building in experimental --- debian/changelog | 8 ++++++++ debian/control | 3 ++- debian/rules | 14 +++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a9ecaf17..0ae2c7f78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cargo (0.17.0-1~exp3) UNRELEASED; urgency=medium + + * Add git to Build-Depends to fix FTBFS. + * Mention cross-compiling in the previous changelog entry. + + -- Ximin Luo Tue, 02 May 2017 13:03:06 +0200 + cargo (0.17.0-1~exp2) experimental; urgency=medium * Bring in some changes from Ubuntu. @@ -9,6 +16,7 @@ cargo (0.17.0-1~exp2) experimental; urgency=medium * Include /usr/share/rustc/architecture.mk in d/rules instead of duplicating awkward arch-dependent Makefile snippets. * Don't embed libgit2, add a versioned B-D to libgit2-dev. + * Add support for cross-compiling bootstrap. -- Ximin Luo Mon, 01 May 2017 20:49:45 +0200 diff --git a/debian/control b/debian/control index 4d89cba47..e77057575 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,8 @@ Build-Depends: debhelper (>= 9.20141010), libgit2-dev (>= 0.25.1), libhttp-parser-dev, libssl-dev, - zlib1g-dev + zlib1g-dev, + git Homepage: https://crates.io/ Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-rust/cargo.git diff --git a/debian/rules b/debian/rules index 8173942b2..1c9a5ecd4 100755 --- a/debian/rules +++ b/debian/rules @@ -82,10 +82,18 @@ override_dh_auto_clean: $(CURDIR)/Makefile \ $(CURDIR)/cargo-stage0 -build-cross: - DEB_BUILD_OPTIONS=nocheck sbuild --profiles=nocheck \ +CROSS_SBUILD = DEB_BUILD_OPTIONS=nocheck sbuild --profiles=nocheck \ --build-failed-commands '%SBUILD_SHELL' \ --add-depends=libc-dev:$(DEB_HOST_ARCH) \ $(EXTRA_SBUILD_FLAGS) \ --host=$(DEB_HOST_ARCH) \ - --no-arch-all . + --no-arch-all + +crossbuild: + $(CROSS_SBUILD) . + +crossbuild-experimental: + $(CROSS_SBUILD) \ + --extra-repository='deb http://httpredir.debian.org/debian experimental main' \ + --build-dep-resolver=aspcud \ + . -- 2.30.2